From 42ac2268773936a0a85b017e5ebac83c4b0b7557 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 23 Oct 2009 13:53:57 +0200 Subject: [PATCH] Bug 598881 - Unimplemented GdkWindowImplIface methods crash gimp on OSX Add dummy for _gdk_input_window_crossing (). Set both input_window_destroy and input_window_crossing pointers in the Impl struct. Reported by John Ralls. --- gdk/quartz/gdkinput.c | 6 ++++++ gdk/quartz/gdkinputprivate.h | 3 +++ gdk/quartz/gdkwindow-quartz.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c index 657d43590b..ea6cdca1e9 100644 --- a/gdk/quartz/gdkinput.c +++ b/gdk/quartz/gdkinput.c @@ -385,3 +385,9 @@ gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble * return FALSE; } + +void +_gdk_input_window_crossing (GdkWindow *window, + gboolean enter) +{ +} diff --git a/gdk/quartz/gdkinputprivate.h b/gdk/quartz/gdkinputprivate.h index 5ec4ee99b5..b8f13ac38a 100644 --- a/gdk/quartz/gdkinputprivate.h +++ b/gdk/quartz/gdkinputprivate.h @@ -147,6 +147,9 @@ gint _gdk_input_disable_window (GdkWindow *window, GdkDevicePrivate *gdkdev); void _gdk_init_input_core (void); +void _gdk_input_window_crossing (GdkWindow *window, + gboolean enter); + void _gdk_input_exit (void); #endif /* __GDK_INPUTPRIVATE_H__ */ diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 4764498340..24057b50eb 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -25,6 +25,7 @@ #include "gdk.h" #include "gdkwindowimpl.h" #include "gdkprivate-quartz.h" +#include "gdkinputprivate.h" static gpointer parent_class; @@ -3035,4 +3036,6 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface) iface->queue_antiexpose = _gdk_quartz_window_queue_antiexpose; iface->queue_translation = _gdk_quartz_window_queue_translation; iface->destroy = _gdk_quartz_window_destroy; + iface->input_window_destroy = _gdk_input_window_destroy; + iface->input_window_crossing = _gdk_input_window_crossing; } -- 2.30.2